From: Yehuda Katz <wycats@gmail.com>
Date: Thu, 29 May 2014 21:06:43 +0000 (-0700)
Subject: Up to date with master
X-Git-Tag: archive/raspbian/0.35.0-2+rpi1~3^2^2^2^2^2^2^2~1038
X-Git-Url: https://dgit.raspbian.org/%22http://www.example.com/cgi/success//%22http:/www.example.com/cgi/success/?a=commitdiff_plain;h=e42203f7f617571d0a49fa5aca3007949bfd0f5d;p=cargo.git

Up to date with master
---

diff --git a/libs/hamcrest-rust b/libs/hamcrest-rust
index 16b761d43..822fc1601 160000
--- a/libs/hamcrest-rust
+++ b/libs/hamcrest-rust
@@ -1 +1 @@
-Subproject commit 16b761d4372b4e91af06848781c8e998c3f25116
+Subproject commit 822fc16016ccd5d24ba460d141e8f2d17db883a0
diff --git a/tests/test_cargo_compile.rs b/tests/test_cargo_compile.rs
index be1dc7e0b..d8cb6c331 100644
--- a/tests/test_cargo_compile.rs
+++ b/tests/test_cargo_compile.rs
@@ -192,7 +192,7 @@ test!(cargo_compile_with_nested_deps {
         "#)
         .file("baz/src/baz.rs", r#"
             pub fn gimme() -> String {
-                "test passed".to_owned()
+                "test passed".to_str()
             }
         "#);
 
@@ -218,7 +218,7 @@ fn main_file(println: &str, deps: &[&str]) -> String {
     buf.push_str(println);
     buf.push_str("); }\n");
 
-    buf.to_owned()
+    buf.to_str()
 }
 
 // test!(compiling_project_with_invalid_manifest)